Matthias Clasen [Sun, 2 Aug 2020 01:26:35 +0000 (21:26 -0400)]
ci: Add gnome-desktop-testing to images
Matthias Clasen [Sun, 2 Aug 2020 01:23:34 +0000 (21:23 -0400)]
testsuite: Fix installed tests
This broken recently, when we converted the tests
array to a dictionary.
Fixes: #2966
Matthias Clasen [Sun, 2 Aug 2020 01:30:31 +0000 (01:30 +0000)]
Merge branch 'glib-build-fix' into 'master'
togglebutton: Don't crash on click
See merge request GNOME/gtk!2334
Matthias Clasen [Sun, 2 Aug 2020 00:09:05 +0000 (20:09 -0400)]
togglebutton: Don't crash on click
The code used to do
if (parent_class->clicked)
parent_class->clicked (...)
That is pointless because the parent_class never changes,
so there' no need for that if and commit
415946eb0f3b76ba25
took it out. Unfortunately, p arent_class->clicked is NULL
though, so the whole call needs to go.
Matthias Clasen [Sat, 1 Aug 2020 23:58:04 +0000 (23:58 +0000)]
Merge branch 'wip/baedert/for-master' into 'master'
Wip/baedert/for master
Closes #2980, #2974, #2949, and #2766
See merge request GNOME/gtk!2333
Timm Bäder [Sat, 1 Aug 2020 18:00:13 +0000 (20:00 +0200)]
Fix and improve various code samples
Timm Bäder [Sat, 1 Aug 2020 17:30:31 +0000 (19:30 +0200)]
aboutdialog: Fix a code sample
gdk_texture_new_from_file takes a GFile these days.
Timm Bäder [Sat, 1 Aug 2020 17:24:54 +0000 (19:24 +0200)]
togglebutton: Modernice source file
Make this a little less ancient looking.
Timm Bäder [Sat, 1 Aug 2020 13:34:59 +0000 (15:34 +0200)]
Avoid refering to old GtkContainer API in the docs
Timm Bäder [Sat, 1 Aug 2020 13:34:07 +0000 (15:34 +0200)]
button: Use g_object_notify_by_pspec()
Timm Bäder [Sat, 1 Aug 2020 13:27:13 +0000 (15:27 +0200)]
stack: Allow NULL names
Does this work?
Timm Bäder [Sat, 1 Aug 2020 13:26:53 +0000 (15:26 +0200)]
stack: Only compare page names if the new page has one
Timm Bäder [Sat, 1 Aug 2020 13:26:28 +0000 (15:26 +0200)]
listbox: Add _append
To have easy replacement API for gtk_container_add.
Timm Bäder [Sat, 1 Aug 2020 08:31:53 +0000 (10:31 +0200)]
adwaita: Reset popover background in backdrop
Otherwise it inherits the generic background color from .background
Fixes #2766
Timm Bäder [Sat, 1 Aug 2020 08:31:38 +0000 (10:31 +0200)]
popover: Use gtk_widget_add_css_class
Timm Bäder [Sat, 1 Aug 2020 07:30:48 +0000 (09:30 +0200)]
window: Keep titlebar after main child
Fixes #2949
Timm Bäder [Sat, 1 Aug 2020 06:56:34 +0000 (08:56 +0200)]
inspector: Avoid some failing casts
We might be inspecting a non-widget here, so can't just cast that.
Timm Bäder [Sat, 1 Aug 2020 06:41:55 +0000 (08:41 +0200)]
textview: Only show "insert emoji" menu item if editable
Fixes #2974
Timm Bäder [Sat, 1 Aug 2020 06:07:43 +0000 (08:07 +0200)]
mediastream demo: Add a weak pointer to the window
Do what other demos do as well.
Fixes 2983
Timm Bäder [Sat, 1 Aug 2020 05:58:36 +0000 (07:58 +0200)]
inspector: Add a type check
We only connect to this signal if sl->obejct is a GtkAccessible, so only
disconnect from it on the same condition.
Fixes #2980
Jordi Mas [Sat, 1 Aug 2020 05:30:25 +0000 (07:30 +0200)]
Update Catalan translation
Rico Tzschichholz [Fri, 31 Jul 2020 19:31:40 +0000 (19:31 +0000)]
Merge branch 'ricotz/for-master' into 'master'
Add annotations to improve GIR API
See merge request GNOME/gtk!2332
Rico Tzschichholz [Fri, 31 Jul 2020 17:12:40 +0000 (19:12 +0200)]
gtk: Add annotations to improve GIR API
Rico Tzschichholz [Fri, 31 Jul 2020 17:12:12 +0000 (19:12 +0200)]
gsk: Add annotations to improve GIR API
Rico Tzschichholz [Fri, 31 Jul 2020 17:11:23 +0000 (19:11 +0200)]
gdk/x11: Add annotations to improve GIR API
Matthias Clasen [Fri, 31 Jul 2020 18:52:50 +0000 (18:52 +0000)]
Merge branch 'glib-build-fix' into 'master'
widget: Drop unnecessary includes
See merge request GNOME/gtk!2328
Matthias Clasen [Fri, 31 Jul 2020 18:20:11 +0000 (14:20 -0400)]
meson: Try to limit the damage
Try to teach meson not to build our subprojects with
-Werror, since that is just insane, and exposes us
to random build failures in subprojects.
Matthias Clasen [Fri, 31 Jul 2020 17:39:22 +0000 (17:39 +0000)]
Merge branch 'dont-always-inline' into 'master'
gsk: Don't the always_inline function attribute
See merge request GNOME/gtk!2331
Matthias Clasen [Fri, 31 Jul 2020 17:37:29 +0000 (13:37 -0400)]
testgtk: More GTimeVal eradication
Matthias Clasen [Fri, 31 Jul 2020 17:13:46 +0000 (13:13 -0400)]
gsk: Don't the always_inline function attribute
Visual C doesn't understand it, and the compiler
should know better, anyway.
Matthias Clasen [Fri, 31 Jul 2020 17:10:47 +0000 (17:10 +0000)]
Merge branch 'master.win32' into 'master'
Some improvements for GDK/Win32
See merge request GNOME/gtk!2327
Matthias Clasen [Fri, 31 Jul 2020 17:10:05 +0000 (17:10 +0000)]
Merge branch 'wip/carlosg/cursor-fallout' into 'master'
gdk: Fix toplevel calculation on pointer grab switch
Closes #2970
See merge request GNOME/gtk!2330
Matthias Clasen [Fri, 31 Jul 2020 17:07:31 +0000 (13:07 -0400)]
Bump the glib dependency
Some of the new apis we want to use to avoid
deprecations were only introduced in 2.65.
Matthias Clasen [Fri, 31 Jul 2020 16:18:54 +0000 (12:18 -0400)]
placesview: Keep up with GLib deprecations
We were using deprecated GBookmarkFile api here too.
Carlos Garnacho [Fri, 31 Jul 2020 16:46:47 +0000 (18:46 +0200)]
gdk: Fix toplevel calculation on pointer grab switch
This check used to read if (grab || device_type != GDK_DEVICE_TYPE_PHYSICAL),
the grab check was only reserved to physical devices, which the current
pointer device definitely doesn't act like. So the condition was "fixed" the
wrong way around, and the latter check is now moot, so the condition should
really go away. We always want to check the new toplevel under the pointer
here.
Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/2970
Matthias Clasen [Fri, 31 Jul 2020 16:33:46 +0000 (16:33 +0000)]
Merge branch 'cups-build-fix' into 'master'
Fix the build with cups < 2.3
Closes #2968
See merge request GNOME/gtk!2329
Matthias Clasen [Fri, 31 Jul 2020 16:08:41 +0000 (12:08 -0400)]
recentmanager: Keep up with GLib deprecations
All the time_t based apis in GBookmarkFile have
been deprecated; use GDateTime instead. This
changes a few GtkRecentManager APIs.
Matthias Clasen [Fri, 31 Jul 2020 15:36:03 +0000 (11:36 -0400)]
numericsorter: Ignore deprecations
We use g_value_get_char here; replacing it with
g_value_get_schar is not entirely trivial, so just
ignore deprecations for now.
Matthias Clasen [Fri, 31 Jul 2020 15:22:16 +0000 (11:22 -0400)]
gtkicontheme: Stop using GTimeVal
It has been deprecated and the deprecation warnings
break our -Werror build in ci.
Chun-wei Fan [Wed, 4 Dec 2019 10:41:05 +0000 (18:41 +0800)]
GDK-Win32: Use SetProcessDpiAwarenessContext() where available
This allows us to use DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 for the
DPI awareness mode, which will help us to better support use cases with
multiple monitors. This is actualy a more advaned version of the
current PROCESS_PER_MONITOR_DPI_AWARE via using SetProcessDpiAwareness().
Note that this is not enabled by default, but also enabled via using
GDK_WIN32_PER_MONITOR_HIDPI, as in the PROCESS_PER_MONITOR_DPI_AWARE
case.
Note also, that appliation compatibility settings and DPI-awareness
manifests takes precedence over this API call, as before.
Chun-wei Fan [Mon, 27 Jul 2020 09:02:00 +0000 (17:02 +0800)]
demos: Fix running on Visual Studio builds
We need to mark the non-static callback functions for export.
Chun-wei Fan [Fri, 31 Jul 2020 10:44:10 +0000 (18:44 +0800)]
gskrenderer.c: Default to the GL renderer on Windows too
Since we have now made the Win32 GL contexts share the global context as
the other backends have, we are more ready to use the GL renderer by
default on Windows as well.
Note that currently we can only enable this when not running on
OpenGL/ES as the OpenGL/ES shaders are not ready at this point, and the
OpenGL/ES support that we have from libANGLE does not support full
desktop OpenGL operations.
Chun-wei Fan [Fri, 31 Jul 2020 10:37:05 +0000 (18:37 +0800)]
gdkglcontext-win32.c: Create a global shared GL context
Like the other backends, we ought to create our WGL/EGL GL contexts like
the following:
"Create a global GL context that connects all GL contexts on a display
and lets us share textures between them."
Chun-wei Fan [Mon, 27 Jul 2020 08:59:05 +0000 (16:59 +0800)]
gdksurface-win32.c: Deal with modal and decoration props
Handle these cases, especially the modal case, which we did not handle
previously after the conversion to surface subtypes.
Matthias Clasen [Fri, 31 Jul 2020 14:54:41 +0000 (10:54 -0400)]
x11: Stop using GTimeVal
It has been deprecated, and that is breaking our
ci builds with -Werror.
Matthias Clasen [Fri, 31 Jul 2020 14:34:37 +0000 (10:34 -0400)]
widget: Drop unnecessary includes
We don't need to include gobjectnotifyqueue.c anymore,
since style properties are gone. This should fix the
build with -Werror.
Matthias Clasen [Fri, 31 Jul 2020 14:00:20 +0000 (10:00 -0400)]
Fix the build with cups < 2.3
PPD_CUSTOM_UNKNOWN was introduced in cups 2.3.
Only handle it when we build against a new enough cups.
Fixes: #2968
Florentina Mușat [Fri, 31 Jul 2020 13:42:35 +0000 (13:42 +0000)]
Update Romanian translation
Yuri Chornoivan [Fri, 31 Jul 2020 12:52:54 +0000 (12:52 +0000)]
Update Ukrainian translation
Daniel Mustieles [Fri, 31 Jul 2020 11:48:24 +0000 (13:48 +0200)]
Updated Spanish translation
Matthias Clasen [Thu, 30 Jul 2020 12:36:01 +0000 (08:36 -0400)]
3.99.0
Matthias Clasen [Fri, 31 Jul 2020 02:15:56 +0000 (22:15 -0400)]
testsuite: Use Wayland by default
I'm tired of xwayland crashing and killing my shell.
Matthias Clasen [Thu, 30 Jul 2020 17:50:54 +0000 (17:50 +0000)]
Merge branch 'focus-active' into 'master'
Focus active
Closes #2390
See merge request GNOME/gtk!2324
Matthias Clasen [Thu, 30 Jul 2020 17:23:45 +0000 (13:23 -0400)]
eventcontrollerkey: Update im focus when active window changes
Use the new GTK_CROSSING_ACTIVE crossing events to update
the im context focus when the window becomes active or
inactive. IBus requires this, since it has only a single,
global focus location.
Fixes: #2390
Matthias Clasen [Thu, 30 Jul 2020 17:22:26 +0000 (13:22 -0400)]
window: Emit GTK_CROSSING_ACTIVE crossing events
Emit crossing events when the active window changes.
We don't want to emit GTK_CROSSING_FOCUS events, since
every window has its own focus location (focus does not
jump from window to window), so we use the new
GTK_CROSSING_ACTIVE type of crossing event for this.
Matthias Clasen [Thu, 30 Jul 2020 17:21:28 +0000 (13:21 -0400)]
Define GTK_CROSSING_ACTIVE
Document the different crossing event kinds that we use,
and add GTK_CROSSING_ACTIVE. We are going to use it in
the future when the active window changes.
Matthias Clasen [Thu, 30 Jul 2020 17:01:15 +0000 (17:01 +0000)]
Merge branch 'wip/carlosg/more-device-api-cleanup' into 'master'
More device API cleanup
See merge request GNOME/gtk!2323
Carlos Garnacho [Thu, 30 Jul 2020 15:52:28 +0000 (17:52 +0200)]
gdk: Rename gdk_seat_get_physical_devices() to gdk_seat_get_devices()
We don't want to tell what they are, and the distinction is now less
clear. Remove the adjective from the function name.
Carlos Garnacho [Thu, 30 Jul 2020 15:46:49 +0000 (17:46 +0200)]
gdk: Drop gdk_device_get_device_type()
There is no longer a hierarchy of devices, or none that is seen
on the outside.
Carlos Garnacho [Thu, 30 Jul 2020 15:37:19 +0000 (17:37 +0200)]
gdk/x11: Make device type a X11 detail
The only legit uses of device types are here in gdk/x11, move the
concept of device type to X11, so we can drop it from public API.
Carlos Garnacho [Thu, 30 Jul 2020 15:15:14 +0000 (17:15 +0200)]
gdk: Make gdk_device_list_physical_devices() private
Physical devices should probably be accounted internally in gdk/x11,
make this out of private API so at least the implementation details
don't leak.
Carlos Garnacho [Thu, 30 Jul 2020 12:30:57 +0000 (14:30 +0200)]
gdk: Drop gdk_device_get_associated_device()
Devices are no longer associated like this, the seat should be used
to resolve queries on other devices.
Carlos Garnacho [Thu, 30 Jul 2020 12:29:24 +0000 (14:29 +0200)]
gtkimcontext: Avoid gdk_device_get_associated_device()
Query the seat for that.
Carlos Garnacho [Thu, 30 Jul 2020 12:29:12 +0000 (14:29 +0200)]
gtktextview: Avoid gdk_device_get_associated_device()
Query the seat for that.
Carlos Garnacho [Thu, 30 Jul 2020 12:28:59 +0000 (14:28 +0200)]
gtkwindowhandle: Avoid gdk_device_get_associated_device()
Query the seat for that.
Carlos Garnacho [Thu, 30 Jul 2020 12:28:45 +0000 (14:28 +0200)]
gtkdragsource: Avoid gdk_device_get_associated_device()
Query the seat for that.
Carlos Garnacho [Thu, 30 Jul 2020 12:28:15 +0000 (14:28 +0200)]
gdk/x11: Avoid gdk_device_get_associated_device()
Query the seat for that.
Carlos Garnacho [Thu, 30 Jul 2020 12:27:46 +0000 (14:27 +0200)]
gdk/win32: Avoid gdk_device_get_associated_device()
Query the seat for that.
Carlos Garnacho [Thu, 30 Jul 2020 12:27:25 +0000 (14:27 +0200)]
gdk/macos: Avoid gdk_device_get_associated_device()
Query the seat for that.
Carlos Garnacho [Thu, 30 Jul 2020 12:26:51 +0000 (14:26 +0200)]
gdk: Avoid gdk_device_get_associated_device()
Query the seat for that.
Benjamin Otte [Thu, 30 Jul 2020 15:31:27 +0000 (15:31 +0000)]
Merge branch 'wip/otte/geometry' into 'master'
Some GdkGeometry cleanups
See merge request GNOME/gtk!2322
Benjamin Otte [Thu, 30 Jul 2020 15:05:23 +0000 (17:05 +0200)]
Remove unused GDK_HINT_POS
Benjamin Otte [Thu, 30 Jul 2020 03:02:30 +0000 (05:02 +0200)]
Remove gravity from GdkGeometry
It's always northwest
Benjamin Otte [Thu, 30 Jul 2020 02:50:46 +0000 (04:50 +0200)]
Remove aspect ratio from GdkGeometry
It's unused.
Benjamin Otte [Thu, 30 Jul 2020 02:46:09 +0000 (04:46 +0200)]
gdk: Remove unused flags
Benjamin Otte [Thu, 30 Jul 2020 02:42:11 +0000 (04:42 +0200)]
gdk: Remove base_size and increment from GdkGeometry
It's unused.
Matthias Clasen [Thu, 30 Jul 2020 12:18:02 +0000 (12:18 +0000)]
Merge branch 'wip/master.win.egl' into 'master'
Add an EGL (OpenGL/ES 3) renderer for GTK+-4.x (using Google's ANGLE project) for Windows
Closes #105
See merge request GNOME/gtk!215
Rico Tzschichholz [Thu, 30 Jul 2020 07:35:48 +0000 (07:35 +0000)]
Merge branch 'ricotz/for-master' into 'master'
a11y: Fix typo in GtkATContext::state-changed docs
See merge request GNOME/gtk!2320
Rico Tzschichholz [Thu, 30 Jul 2020 07:06:49 +0000 (09:06 +0200)]
a11y: Fix typo in GtkATContext::state-changed docs
Chun-wei Fan [Tue, 7 May 2019 07:09:03 +0000 (00:09 -0700)]
GDK/Win32: Force GLES if running on ARM64
If GLES support is enabled on Windows, force GLES mode if we are running
on a ARM64 version of Windows (i.e. Windows 10 for ARM).
This is required as ARM64 versions of Windows only provide a software
implementation of OpenGL 1.1/1.2, which is not enough for our purposes.
Thus, we could make instead use the GLES support provided via Google's
libANGLE (which emulates OpenGL/ES 3 with Direct3D 9/11), so that we
can run GtkGLArea programs under OpenGL/ES in ARM64 versions of Windows.
Note that eventually we could update the libepoxy build files for Windows
to not check nor enable WGL when building for ARM64 Windows, as the WGL
items do not work, although they do build.
Chun-wei Fan [Tue, 31 Jul 2018 10:18:59 +0000 (18:18 +0800)]
OpenGL/ES: Fix 'R' and 'B' bits inverted on Windows
We need to use GL_BGRA instead of GL_RGBA when doing glReadPixels() on
EGL on Windows (ANGLE) so that the red and blue bits won't be displayed
inverted.
Also fix the logic where we determine whether to bit blit or redraw
everything.
Chun-wei Fan [Fri, 3 Aug 2018 07:54:48 +0000 (15:54 +0800)]
demos: Fix glarea demo on OpenGL/ES
Some implementations of the ES 1.00 shader (such as Google's ANGLE) do
not like the 'f' suffix for floats, so just drop it, as it should be
harmless to drop.
Chun-wei Fan [Tue, 31 Jul 2018 10:11:26 +0000 (18:11 +0800)]
Add a EGL renderer (via ANGLE) for Windows
This is for adding a EGL-based renderer which is done via the ANGLE
project, which translate EGL calls to Direct3D 9/11. This is done as a
possible solution to issue #105, especially for cases where the needed
full GL extensions to map OpenGL to Direct3D is unavailable or
unreliable, or when the OpenGL implementation from the graphics drivers
are problematic.
To enable this, do the following:
-Build ANGLE and ensure the ANGLE libEGL.dll and libGLESv2.dll are
available. A sufficiently-recent ANGLE is needed for things to
work correctly--note that the copy of ANGLE that is included in
qtbase-5.10.1 is sufficient. ANGLE is licensed under a BSD 3-clause
license.
-Build libepoxy on Windows with EGL support enabled.
-Currently, prior to running GTK+ programs, the GDK_DEBUG envvar needs
to be set with gl-gles as at least one of the flags.
Known issues:
-Only OpenGL ES 3 is supported, ANGLE's ES 2 does not support the needed
extensions, notably GL_OES_vertex_array_object, but its ES 3 support is
sufficient.
-There is no autodetection or fallback mechanism to enable using
EGL/Angle automatically yet. There are no plans to do this in this
commit.
Chun-wei Fan [Fri, 22 Jun 2018 07:02:24 +0000 (15:02 +0800)]
build: Check for EGL support in libepoxy on Windows
...EGL support needs to be explicitly enabled during the build of
libepoxy on Windows as it is not enabled by default on Windows.
With this, we can add an EGL renderer for Windows that make use of
Google's libANGLE, which is a library that translates OpenGL/ES calls
to Direct3D 9/11, which will provide better hardware compatibility
on Windows and would act as one of the foundations to resolve issue #105.
Matthias Clasen [Thu, 30 Jul 2020 03:55:23 +0000 (03:55 +0000)]
Merge branch 'display-cleanup' into 'master'
Display cleanup
See merge request GNOME/gtk!2319
Matthias Clasen [Thu, 30 Jul 2020 03:43:30 +0000 (03:43 +0000)]
Merge branch 'surface-cleanup' into 'master'
Surface cleanup
See merge request GNOME/gtk!2317
Matthias Clasen [Thu, 30 Jul 2020 03:28:02 +0000 (03:28 +0000)]
Merge branch 'a11y-work' into 'master'
A11y work
See merge request GNOME/gtk!2318
Matthias Clasen [Thu, 30 Jul 2020 03:00:57 +0000 (23:00 -0400)]
docs: Don't refer to nonexisting functions
gdk_surface_input_shape_combine_mask() no longer
exists.
Matthias Clasen [Thu, 30 Jul 2020 02:55:19 +0000 (22:55 -0400)]
gdk: Move default group api to the X11 backend
This is the only place where it is implemented.
Matthias Clasen [Thu, 30 Jul 2020 02:10:56 +0000 (22:10 -0400)]
a11y: Set an accessible role for GtkLevelBar
Use the 'meter' role for GtkLevelBar, and set the
appropriate properties.
Update the docs and add a test.
Matthias Clasen [Thu, 30 Jul 2020 01:55:34 +0000 (21:55 -0400)]
a11y: Set an accessible role for GtkExpander
Use the button accessible role for GtkExpander
and set attributes as appropriate.
Update the documentation and add a test.
Matthias Clasen [Thu, 30 Jul 2020 00:26:16 +0000 (20:26 -0400)]
a11y: Set accessible role for GtkLinkButton
Set the accessible role for GtkLinkButton to button.
We don't use the 'link' role since ARIA says "if it
behaves like a button, use 'button'".
Update docs and add a test.
This changes should not be neccessary, since
GtkLinkButton derives from GtkButton, see #2965.
Matthias Clasen [Wed, 29 Jul 2020 22:18:04 +0000 (18:18 -0400)]
a11y: Set an accessible role for GtkTextView
Use the text-box accessible role for GtkTextView
and set properties as appropriate.
Update the documentation and add a test.
Matthias Clasen [Thu, 30 Jul 2020 02:40:01 +0000 (22:40 -0400)]
Rename gdk_surface_queue_expose
We don't have expose events anymore; instead, there
is a ::render signal. So rename queue_expose to
queue_render to match.
Update all callers.
Matthias Clasen [Thu, 30 Jul 2020 02:30:44 +0000 (22:30 -0400)]
gdk: Stop exporting gdk_surface_freeze_updates
The only legitimate use for freezing the frame clock
is in GDK backends. Exporting this function for
applications makes no sense.
Matthias Clasen [Thu, 30 Jul 2020 00:23:46 +0000 (20:23 -0400)]
iconbrowser: Add screenshots to appdata
appstream validation is picky and insists we have
at least on screenshot.
Matthias Clasen [Wed, 29 Jul 2020 21:58:45 +0000 (17:58 -0400)]
Update our appdata files
Mention the new release in all our appdata files.
Matthias Clasen [Wed, 29 Jul 2020 21:42:49 +0000 (17:42 -0400)]
icon-browser: Install desktop file and appdata
That is needed to make the flatpak build in our
ci happy.
Matthias Clasen [Wed, 29 Jul 2020 20:35:36 +0000 (16:35 -0400)]
testsuite: Skip the skipping
meson 0.55 considers a test failed if we skip any cases.
Until that is fixed, just skip them quietly.
See https://github.com/mesonbuild/meson/issues/7515
Matthias Clasen [Wed, 29 Jul 2020 18:57:07 +0000 (14:57 -0400)]
testsuite: Stop setting NO_AT_BRIDGE
We are not paying attention to that environment
variable anymore.